Refactored dependecies + added oAuth proxy