Added more GA tracking