Code changes for implementation of UbiquityStoreManager module