Refactored dependencies. Fixed Oracle dep