Add support for multiple users