Add in video support & pagination