More DBCP migration