dbcp refactor