Migrate existing code to use it
Migrate existing code to use it