Added socket and public