Made code simpler in IoServer