Deprecations, additions and compatability