EAP model added
Fieldbuilder renamed to widgetBuilder