Add support for new db