Changed map type handling