Rewrite CommandAPI