Resolve cyclical dependency