Refactored how values are associated with a state