updated to the current s57 syntax