Changes for new OSM design