More changes for server-side