Added Data store setup