Final changes for automatic workflow