some refactoring in SDD import