Changes for video integration
Global refactoring update