Added minimal support for DB