Adding handling of datestamps in PI.