Hibernate Search refactoring