Added tables for named types tracking