Add multiple local data store support