Add mapping to remove white spaces