Reworked Associations to be independent of Attributes