added analytics and updated modules