Added support for atomicity in store and remove operations