Added ComponentReference support to EntityModel