Classes refactoring
Managed even more types