Made workspace reference lazy
Code clean