Added attachment support
Corrrect import