Added more

  Checked the code, class might be passed from user input. (And why not?..)