Added Arguments check