Improving workflow and adding logs