Add basic object manager