Replaced Analytics implementation with new GMS version