Now includes scenario data