adjust to new associations concept, separate from entity
move transitive association declaration to the end