Added movie scopes
Refactoring movie scopes