Refactoring Movie to actually contain the correct model of changes