Refactor. Add atoms.