Refactoring of ImageBuilder