Handle deprecations
Update features to match the code