Adding mandatory name check