Add basic validation