Adds basic object handler class + small tweaks