Change to new DB framework