Bug fix -> lists not handled correctly when checking creation/updating state.