Updated output definitions