Adapts remaining calls to attach_file