refactor passage store