Updated command templates