Replace old command parsing with new