Add last and retry functionality