Remove dependency on general-entity