Add states and misc sections