Updated commands and split tasks