Improved validation and design changes