Endpoint mapping support WIP