Improve state management using ValueHolder