Made sure we use typed objects.