Added basic multiuser support