Client/server architecture rework