Further merge StateInfo setup functions