Added multiple user functionality