Fixed circular dependency issue