Modifying Record implementation to have a Map, refactoring of AnalytcsDataSource interface