Added in some new state features