Add specific end date and improve the workflow