Add some useful type references in TypeSystem
Fix merge
Merge branch 'typesystem'