Ok, I will prepare a separate pull request.