Add more tracking