Improve maps helper