Sorry guys for having left so many things for you to fix.
I am not completely familiar with Sylius coding choices (yet) but I am looking at all your changes and learning from them.