Make it work with Shippable V2