Refactored state update custom actions