Enhanced validation conditions