Enforcing Discipline concept into freelance feature
Accomodated the changes on all places due to the concept of discipline field.