Mailman refactor