Change CurrentStatus to CurrentState