Updated Command Class

Thanks @Icarus_Wings