StateHandler class changed with IStateHandler interface