Change interface IDiscipline. Add TODO's for auto-propeties.