Removed key types from associations
Added AssociationSupport
Replaced association implementation