State Management solution added.