Added support for authentication and users