Added management of roles and rights