Added authentication and authorisation