Christian, I have started working these ideas into my ongoing work. I just pushed the initial piece of that. It mainly centers around the renamed org.hibernate.query.sqm.produce.function.SqmFunctionRegistry, org.hibernate.query.sqm.produce.function.NamedFunctionTemplateBuilder and org.hibernate.query.sqm.produce.function.PatternFunctionTemplateBuilder