Centralize schema, importer tweaks