Added extra options for authentication