Better integration of Google analytics