Added arguments validation