Made DataMap into a Library