Handle identical files while copying instead of during parse
Fixed compilation errors due to API changes