Refactoring to use module for osm pbf import