Updated with new commands