Switch to using Object.defineProperty()