update resolver and validation