Updated for SignalCollect Support