Few snippet changes