Removing Object.defineProperty calls for compatibility