Btw @raulraja feel free to copy the code for now (even keeping it in the same package), I'll extract the pieces you're using and publish them