Refactored options building of access token
Refactored options building of access token