Support for ATI organization updates and local datastore use