Added client, server, etc