Added java8 conditional