Fixed validation schemas