Added new events to video-impl + some refactoring