Added timeframe selection