Continued work on socket API