Fixed xml and updated simple range analysis