Refactor Resources with Java 8 features ! Fixes #106