improved map loader