Enhanced validation and messages