-clean up store usage, add support for add(basic) and delete