Feature/buffer commands