Added hasOwnProperty