Improved validation rules