Extend Command struct to have more members