Added marshalling for OSM
Make child modules use the new marshalling