Resolve circlular import