Improving Server Integration