Improve java 8 back end