Currect Lazy Referencing

this PR suggest a series of correction through the structures prepared in order to resolve lazy referencing.
I am not sure about the order of params in these 5 functions. I will leave it to @zdne