add signal and state local data support