Subject functionality added