Add forecast support