Added map_keys and map_values functions