Modify util classes
Add AttachmentResource
Modify Template