Add support for shop id