Attempting to remove circular import