Added in the two typing variations.