Lots of nice changes on Store and pagination