#73 Improved Region and State models