Storage keys now match either the controller (for annotation) or path (for path limit)