Circular import fixed