Adapt to new version of Atoms