Improved map retrieval

fixes #17