Update DataObjectStep class hierarchy