Solved issues with cyclic dependencies