Made adjustments for different property comparison method