Added contract/subject capabilities