Changes to fetch property values in blocks