Feature/schema update

Just some tidying up of the schema and the import script.