added macros to cross reference entities and value objects