Fixing issues with database structure importing