Minor refactoring, removed IStateDA