Update for new commands