[IMP] Add shippable compatibility