Solution for cyclic dependencies