Some work towards id range compatability