added context visitor for embellishments