enrich the handler for trader api