adjusted to new associations concept, separate from entity