Added State Class