Updated definitions for this issue