Made server and client independent