added support to movie and tv show
refact