Added changes to match the Command Pattern.