Moved getPropertyValue to helper file