Added gmail support; Improved collation of variables