Changes to the pass-constructors from voxel-branch