added more roles and security