Added new workflows structure and options