More work towards range compat
More compat files added