Added the Object Manager