Add scaleout images
Refactoring