Update paths
Add analytics