Refactoring Nitro to YouView mapping