improve performances of atom add and remove