Reworking getPropertyValue()