Refactoring DataAccessor.