Correct Lazy Referencing

this PR suggest a series of correction through the structures prepared in order to resolve lazy referencing.
Please revert this change. It is not related to this task.