Updates to DBWrapper