Doc tweak
Refactor attachment methods