Adaption for latest snippet change