Moved to get/set for swappable stores