Revamped configuration, switched to single OSM back-end