Nebel TV ContentWrapper API refactoring