Adding support for users that have duplicate names, names with '-' and ''' in them, as well as, overall changes to the employee model.