Added workflow class and removed manual setup of an option