Handling deprecations