Added subject and classification functionality.