Feature/amend imports

This included work from new-data-model to spec so far