Simplified hsSignal
Moved main to new field format