Allow maps to include spaces