Refactor using Dbd 0.0.19 feature