Added @shPropertyHasValue macro