Minor updates to schema, can now import without issues...