Added missing dependencies and version constraints