I need to adapt the previous pull request I've sent with the latest changes you made to the core. I'll have a look at it tomorrow.