Some refactorings. Added the first options into the workflow but they get yet ignored.