Fix namespace problem
Support OAuth2 password grant type