Fixed macros
Added root object class