Dependency issues reolved