Let us move this stage into another PR, I'll consider rather the rest of PR separately.