Added attachment handling for entries