Removed WithoutPropertyResolution as it wasn't necessary.