Several improvements to the SmarterTrack importer