Fixed JSON performance
Refactoring to use Java 8 API's even more