Updated to handle sketches and attachments

Updated to handle sketches and attachments