Add wrapping to InfoPlaceholder and add PopInfo