handling paths improvements