More development on Shop