Added substate feature.