Improving command skeleton.