+ more CNS saved location support