Implemented multi-user support