Added authentication and roles