Little update of atoms handling