Fix commands api