Incorporated Annotation substitution inside the TypeSubstitution we already had