Refactored OSM import