Data method refactor.