Added images refactored builder.