Refactor Movie model