[Examples] More modifications