Updated Schema to facilitate change in Many-Many-Polymorphic Relations