Add classes awaiting refactoring