It's not great that overriding this CP mean having to redeclare all of the dependent keys; seems very brittle