Added changes to include socket io