Updated workflow for editing/creating