Refacto: add specific SRDAG actors
Resume some optims