Make authentication options more flexible