Some entity and API updates