* Added more mappings