OGM-397 Incorporating review remarks
OGM-397 Logging description and reason in case of errors
OGM-397 Using list function to simplify retrieval of entity/association counts