Modifications to DBHandler