Added optional storage of attached media.