More strict validation