Enahnced link and host stores to extend general store.
14 files changed