Feature/dependency cycle fix