Added code for property checking