Removed some spaces and added few new entried
Added more mappings