Updated atom addons