Implementation for User added. Refactor for some domain model classes