Added support for db