Mostly, removed builder options (to reuse just in editor scope, without builders).