Refactor DataInstance traits