Updates for rangedmap (work in progress)