Added arguments to simulator