Support for setting username and password
Added TODO
Cleanup