Add Atom support