Refactor draw-section as attach-section