Added movie fetch and some refactoring