Adding in entityreference and entity api.