Modifications required to build store on the fly