#262 - Subject/Collection redesign