Aligned State and StateService to reflect DefinelyTyped