Builder patterns update