added a new store called AndesContextStore and some refactoring.