Added additional state helper classes