Added Discipline support to the API