Added more support for substates.