Code cleaning
Backward compatibility with setup data import