Add import into existing db && fixes