Added in the two typing variations.
Merge branch 'bkoury'

This commit add in the typing variations.