Modified Movie controller & model