Added support for selective courses