added support for multi-user environment