added more mappings