Fix circular import issue