Added roles and other stuff