Changed some minor stuff to bring tasks to roles