Fix singleton for domain store