Add switch for eager