Multidisciplined Olympic event since 2000