Changess in base object manager and Activities