Updated CFS mappings