Solved circular dependency issues