Refactor DataInterfaces