Added support for server side attachements