DB & Server changes