Added mapping to remove carriage return