Add attachment handling