Add mount retrieval/storage