Improved drivestate management