Removed entityreference dependency from wtp_entity