Move to atom.xml instead