Changes related to Authentication and Atomic