optimisations on ingestion
common attribute definitions reduce storage and speed up import.

- lots of model tidying around common definitions