Adding sfdc template, hardening oauth2 support