WIP refactoring
Add deprecation note