Updated command classes to use better shortcut commands. (Issue #21)