Update for Store 2.2