Additional changes for server-side stuff