Added deprecation and other comments for class refactoring.