Updates to include some db code