Add support for Atom generation