Added switch declarations - in logic.cc