Added support for a simpler AttachAndModify workflow