Improvements to Nimzo data model.