Tidy up profile generation and use Work data model