Modified Analytics Template