Added name check