Store & Gateway Changes