Datatypes-related changes to 2.0 (tracking)