multiuser support

Change-Id: Ibad26bc27a1bf3f6dd59ebf93bc3cf3a1e10385f