Added support for prepopulated DB (Antair)

Changes Merged from Antair fork