Bart refactor local store