@apatrida it seems that my PR is incompatible with some other modules and breaks others' code. Have you noticed that there are a couple of issues on Github that points to the code I wrote? I was thinking about possible solutions but none of them are perfect.