Will start with adding support in my own fork, then submit a pull request if solution is applicable for other users.