Added Comp File support