Adds support for varying service account credentials