Data: removing use of ES5 defineProperty