ModelEntity refactoring for generic activity