Added new command classes and target system