Updating simpledb class to match issue-31