Updated entities. Updated video controller structure.