Add new options last for ABI compatibility