Add google analytics
Updated classes