Added stopped state wrapper