This change also ensures a single source of truth for states used by the UI and those used by the Service. #117