Change atoms from class to object.