Added TimeFilter and ContentFilter support