OGM-642 Addressing review remarks
OGM-647 Raising EntityExistsException if duplicated entity is inserted