Make defaults keys private, part 1