added optional DB flag/support