Sync with builder changes