Registry - Fix construct function