API Socket changes