Added serverarray index and unit test