Validation generation fixes
Improvements to routing