Updated BaseState