Added authentication and authorization