Added some imports/defs to db to let it run in isolation