Nested some of the states, to have proper parent-child relationship