Added support for multiple users