Improved structure of the entire workflow