Update schema to refer to each type individually