Adding map type and fixing boundaries