Move states into constant array