Added types and object references to convenience objects.