WIP enrich the api