add localstore support