Moved to Java 8.
Added some functionals etc.