Update validation and functionality.