Add base factories
Add controls factories
Use builder instead of factory