Replaced depreacted PropertyPath with PropertyAccess