Initial set of updates for ninml/spineml