APOLLO-1888 Missing types