Moved state helpers to State* classes