Refactor objectDAta