Initial commit for updated Collection-handling (timeframe, flag).