Refactored handle on state