[#NA: Refactor construct]