Implemented JH's changes down to classification-class
Implemented JH's changes down to xidentifier-class
Implemented JH's changes down to location-class