Improved AtomManager encapsulation.