replaced objectmanager references