Added XOAUTH2 support