Base image refactoring.