Updating with new commands structure