Minor change to support multi-users