Updated definitions