Updated to reflect new DB API changes