Added omdb support libraries. Refactored Code.