refactored and added models