Add improved features to Datamaps codebase. Consider a pull request for these in the future.