Builder extended

plugin support