Start adding support for multiple users