Adding more flexibility to evoked code