ADDED Server file => Client/Server decoupled