Added missing mappings