Finalize Workflow process and refactoring of some classes