Add Client/Server separation