Resolved a circular import error