added DB support