Refactor video model