Update to work with latest shop