Adding factories for sets of keys.
Fixing up factories to be factoryific.