Add type information to catalog
7 files changed