Adopted new command API