Made DataMap into a Library
Merge branch 'DataMap-extends-Library'