Variant support for Piggybak