Remove circular dependency