Changed to java8 and made the loading faster