added support for subjects