Updated templates according to new roles values