Added multi user support