Updated to use latest store features