More Changes to DBHandler, Doctor