Removed dependency on entity_reference.