cleaned up model and repository base classes - amended!