Add support for multi-slot-*