Refactor map retrieval to work with new data files