Adding authentication and authorization