Add some validation, added faculty model