More Analytics Changes