View Data Object Refactor