Updated for new commands