Fixing Property Method support