Made compliant with new libs with reactor