Add support for Super Types