Fixed recursive dependencies, improved logging