Add what_tail option