Use new entity and API from ws project