Refactoring of relation types, 2

- Addition of "MacroRelation" type to all existing relations.