Added class to handle past data