Added new analytics codes for better tracking