Added more

  class might be passed from user input.