Add defined atoms as options for base_key.
Merge branch 'base_key_atoms'