Working on resolving cyclic dependencies