Replacing more hardcoded values for the property value