[ADD] Compatibility with shippable