Update return type validation