Improve workflow