Changes to DBWrapper