Added support for disciplines.