Modified interface definition for wrap and unwrap methods in TopWrapper
and AnnotationWrapper