Added missing code to convert paths to classes