Maybe worth a look for you: https://github.com/orfjackal/retrolambda