Update index for better integration with Server Frontend