Better required field handling