Add more fields to videos and refactor code for retrieving metadata on video.