Video model refactor