Improved Exchange 2013 support