update Builder and examples