Further work on multi-user support