[WIP] Added client mappings