Updates to the iorm sub-project