Added missing depenencies

Added missing dependencies due to latest refactoring changes