Improved workflow