Pre java 8 upgrade
Migrated to Java 8 (early access lambda builds)