Started adding support for multiple users