Add multiuser support