Add multi-user support