Appointment models expanded
Merged with master