Some epxress 4 edits
DSMR 4 regexp changes