Fixed cyclic dependencies