Added arguments parser