Add compatibility with deliver!