Added more mappings.