Nii - more refactoring