Update horrible proprietary files handling