Added index and server, non-functional