Remove generics, new arrow factory