Minor fixes
Added support for multiple users