Added changes to AnalyticsDataField to make it work properly