Added basic multi-user functionality