Refactor to use Movie Repository