Refactor Data Interface process