Minor changes, providing context to validators