Updated proxy option merging
Files option specs