Mail Server module updated to use CommonClasses