Refactor BaseDataHelper.java