Move to a type inference package