Refactor DataInstance classes