Updated for shop module compatibility