Increase server robustness
add state enum to client