ViewState enhancements and submodule fix