diff --git a/freqtrade/data/converter/converter.py b/freqtrade/data/converter/converter.py
index b59543fbf..4cf14be95 100644
--- a/freqtrade/data/converter/converter.py
+++ b/freqtrade/data/converter/converter.py
@@ -2,6 +2,7 @@
 Functions to convert data from one format to another
 """
 import logging
+import time
 from typing import Dict
 
 import numpy as np
@@ -9,7 +10,7 @@ import pandas as pd
 from pandas import DataFrame, to_datetime
 import itertools
 
-from freqtrade.constants import DEFAULT_ORDERFLOW_COLUMNS, DEFAULT_DATAFRAME_COLUMNS, Config
+from freqtrade.constants import DEFAULT_ORDERFLOW_COLUMNS, DEFAULT_TRADES_COLUMNS, DEFAULT_DATAFRAME_COLUMNS, Config
 from freqtrade.enums import CandleType, TradingMode
 from freqtrade.data.converter.trade_converter import trades_df_remove_duplicates
 
diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py
index 05d7cbbe0..26f063265 100644
--- a/freqtrade/exchange/exchange.py
+++ b/freqtrade/exchange/exchange.py
@@ -22,7 +22,8 @@ from pandas import DataFrame, concat
 from freqtrade.constants import (DEFAULT_TRADES_COLUMNS, DEFAULT_AMOUNT_RESERVE_PERCENT, NON_OPEN_EXCHANGE_STATES, BidAsk,
                                  BuySell, Config, EntryExit, ExchangeConfig,
                                  ListPairsWithTimeframes, MakerTaker, OBLiteral, PairWithTimeframe)
-from freqtrade.data.converter import clean_ohlcv_dataframe, ohlcv_to_dataframe, trades_dict_to_list
+from freqtrade.data.converter import clean_ohlcv_dataframe, ohlcv_to_dataframe, trades_dict_to_list, public_trades_to_dataframe
+from freqtrade.data.converter.converter import _calculate_ohlcv_candle_start_and_end
 from freqtrade.enums import OPTIMIZE_MODES, CandleType, MarginMode, PriceType, TradingMode
 from freqtrade.exceptions import (DDosProtection, ExchangeError, InsufficientFundsError,
                                   InvalidOrderException, OperationalException, PricingError,