Made changes to better support external providers. Google should now work - not backwards compatible.