File attachments support

This should be the good PR, comparison seems much clearer now !!