Better builder
Add simpler method for overrides + tests