Continue working on metrica data source