VideoContainer refactoring