[Bug 885680] - Adding subject management