Reimplement ExpandDefault
Update producers