Added ranges and corresponding workarounds  still a lot to do.