Added State Management