Fix integration with Spring