Improved Object Manager