Now only adds atom materials as needed