Ok, maybe in another PR. One of my goals for this PR is to change mtwt logic as little as possible, just adding namespace and refactoring.