Better architected edit.state namespace and Interceptors for improved testability