Hi, Here we go for the current state of my work and what I would like to do: https://hibernate.atlassian.net/browse/HSEARCH-1392 I created a PR so that we can discuss the changes already made: https://github.com/hibernate/hibernate-search/pull/472 Thanks for your feedback. -- Guillaume