Add TaskArranger and fixed EmailService & XmlService