Import bug fix, Updated DB columns, DB wrapper