FIX: client mappings