Added google analytics and modified types
Types