Adding multi-user support