Update to handle changes in TypeDecl