Updated files following sockets branch merge