Some updates to facilitate the spring-data-elasticsearch integration