Made compatible with latest signshop changes