Added changes for mailing lists