Add basic attachment support