Added operator mode mappings