Added attachment serialization
Added attachment serialization