Slight refactoring of AbstractDBStorage