device stateclasses fix
ns, pumps