Improvenents to the Object Manager