Adding shorthand type support.