Changed return type of TemplateBuilder.imageChooser from TemplateBuilderImpl to TemplateBuilder