Fixed profile. Started model refactoring