Fixed PropertyUtils to correctly handle external files