Updated xml schema for import, updated db schema