Added new atom compatibility.