Will do, yes, lambdas would be great, maybe in 5-7 years when we're finally on Java 8 minimum :)