Thanks, situation clear.
As soon as I ll have pull request ready - we can discuss additional details there. Already working on it :)