More “*Lazy” and “*Many” support in Safe module