Added ObjectHandler
Refactorings
Improved tests