Modify to talk to new databases