Added multiple users support