Added multi-user support