Changed #include statements and CommandBase