Made the video repository a bit more stateless!