Refined User class and added further model classes