- Process only "mail" attribute with -M option - Add separate option -O for "mailLocalAddress" - Expand default domain only for -M (not for -O)