ROASTER-2: Introduced TypeHolder and TypeHolderSource