SQL decoupled in pdb project
refactor