Why is this objectDatabase not refactored as well? Granted, not everything has a file - is this function scheduled for later deprecation? If so, perhaps having a @deprecated would be a good idea. If not, can we call getObjectDatabase() and do some instanceof check?