Helper updated to changes in state definition.