General updates and support for validation Suggestions that happen pre validation